SPIKE: Protocol 28 (CAP-0084) - #552
Draft
sisuresh wants to merge 6 commits into
Draft
Conversation
Pinned to stellar-xdr#307 head 787382ef2099cca168ca1cb282730d6b7b9e2f16.
This was referenced Jul 3, 2026
Contributor
Author
This was referenced Jul 3, 2026
# Conflicts: # Cargo.toml # src/lib.rs # xdr # xdr-version
stellar/stellar-xdr#307 merged (squash) as 13fc2c3 on main, so pin the submodule + xdr-version at the canonical commit instead of the PR branch head 341179e (which is not an ancestor of main after the squash). The .x tree is byte-identical between the two commits, so `make generate` produces no change to the generated Rust or JSON schemas.
Contributor
Author
|
Heads up: #565 (the CAP-0083/0085 ungate) repins the One blocker surfaced by Copilot on #565 that belongs here: with the feature enabled, |
kanwalpreetd
pushed a commit
to kanwalpreetd/rs-stellar-xdr
that referenced
this pull request
Aug 20, 2026
* Ungate CAP-0083 and CAP-0085, repin xdr to 9c9c145 Repins the xdr submodule to stellar-xdr main (stellar/stellar-xdr#311), which removes the CAP_0083 and CAP_0085_EXECUTABLE_REF ifdefs, and drops the matching cap_0083 / cap_0085_executable_ref crate features. Their types are now generated unconditionally. Also drops the two hand-written gates on those features: the VERSION.features list in lib.rs and the ScVal::ExecutableTag arm in scval_validations.rs, which would otherwise leave the match non-exhaustive. The repin also crosses stellar/stellar-xdr#307, so the .x now carries CAP_0084_MUXED_CONTRACT ifdefs. That forces a cap_0084_muxed_contract feature to be declared (generated code cfgs on it) plus a Display arm for ScAddress::MuxedContract; both are taken verbatim from the in-flight SPIKE stellar#552. The feature is off by default. * Merge ExecutableTag into the trivially-valid arm Now that the arm is unconditional it has a body identical to the preceding one, which clippy::pedantic rejects (match_same_arms). * update comment
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Regenerates rs-stellar-xdr XDR for Protocol 28 / CAP-0084 (Muxed Contract Addresses).
Changes
mainat13fc2c35b0a029f46feb0cd745caa1da441a2464(submodule +xdr-versionpinned) — the merge of stellar-xdr#307. That commit also carries the latestmain(CAP-0085 gated changes, Bump for typo and cost types #308), so the generated tree here carries bothcap_0084_muxed_contractandcap_0085_executable_refgated defs.cap_0084_muxed_contractfeature token; bumped version27.0.0→28.0.0.ScAddress::MuxedContract,MuxedContracttype, etc.).maininto this branch as upstream commits landed (CAP-0085 regen Re-generate XDR with gated CAP-85 changes. #556,--hintoption Add--hintoption tostellar-xdr generate#544, unknown-field encode errors error on unknown fields in encode command JSON input #557, unescapedtypeJSON keys Emit unescaped JSON key fortypefields #559) and regenerated from the combined XDR source — generated files are never hand-merged.Reviewer flag
ScAddress::MuxedContractDisplayreturnsErr— muxed contract addresses have no strkey encoding yet (stellar-strkey ≤0.0.18). Needs a human decision on the strkey format.FromStris correct by omission (no muxed-contractStrkeyvariant).CI note
build/testdo not run on this branch:prepareexpands the cargo-hack powerset to 224 feature combinations, so thebuild(2 × 225) andtest(2 × 224) matrices are ~450 jobs each — over GitHub's hard 256-jobs-per-matrix limit, so neither job spawns and thecompleteaggregator goes red.mainis at 112 combinations (458 total jobs) and stays under the cap; adding the thirdcap_*feature doubles it. Needs a matrix-sharding change in.github/workflows/rust.yml(e.g. split the feature list across twotest/buildjob pairs) before this branch can get a real powerset signal.generate,fmt,readme,prepareall pass.Upstream
mainas13fc2c3). This branch is now pinned at that canonical commit rather than the PR branch head341179e, which the squash left unreachable frommain. The.xtree is byte-identical between the two, so the re-pin changed only the submodule pointer andxdr-version— no generated-code diff.Deferred